Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mssql plugin page to mention CONFIG file #967

Merged
merged 1 commit into from
Sep 29, 2024

Conversation

geographika
Copy link
Member

Based on issues mentioned in https://lists.osgeo.org/pipermail/mapserver-users/2024-September/083597.html
Includes minor format fixes and adding keywords to the conf.py file.

@geographika geographika added the backport branch-8-2 (live) To backport a pull request to branch-8-2 label Sep 22, 2024
@geographika geographika merged commit 82e8ae3 into MapServer:main Sep 29, 2024
4 checks passed
Copy link
Contributor

The backport to branch-8-2 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 549cb9a6... Update mssql plugin page to mention CONFIG file
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging conf.py
CONFLICT (content): Merge conflict in conf.py

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-branch-8-2 branch-8-2
# Navigate to the new working tree
cd .worktrees/backport-branch-8-2
# Create a new branch
git switch --create backport-967-to-branch-8-2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 549cb9a6de78d78d2ae857e824f7790a730d41a6
# Push it to GitHub
git push --set-upstream origin backport-967-to-branch-8-2
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-branch-8-2

Then, create a pull request where the base branch is branch-8-2 and the compare/head branch is backport-967-to-branch-8-2.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport branch-8-2 (live) To backport a pull request to branch-8-2 failed backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant